merge trunk
authorKenichi Handa <handa@etlken>
Thu, 24 Jun 2010 06:10:43 +0000 (15:10 +0900)
committerKenichi Handa <handa@etlken>
Thu, 24 Jun 2010 06:10:43 +0000 (15:10 +0900)
commit7de10642353b64c87c333627ef6628b2240490fd
treea1c7e314d8aef5348acb2f553af91ecf83cdd52e
parent138ecd635310eb91da7c4c8815c0da56fb8c2d90
parentc066a0b8a411dc4685e788f9ef95a039a5e7d377
merge trunk